Integration Candidate 20191030 #388
Merged
+3,479
−11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The mutex for the log file write during the WriteLogFileCmd excution was held longer than it should have been. This lock must *NOT* be held during EVS_SendEvent, as this will cause deadlock. This moves the mutex to protect only the area that actually accesses the log data, and it moves all send event calls to be AFTER the mutex is released.
Fix 2 areas where the CFE_ES_GetTaskInfo() function could have been passed an App ID rather than a task ID, which would create an incorrect result.
|
CCB 20191106 - approved for merge to master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the contribution
Fixes #361, fixes #373, fixes #374, fixes #381
Testing performed
Steps taken to test the contribution:
Built without warnings, all tests passed except osal_timer_UT (nominal result on linux)
executed cfe, successful startup with no warnings
Expected behavior changes
Resolved potential lockup bug
Resolved anomalous messages produced during app delete
System(s) tested on:
Additional context
None
Contributor Info
Jacob Hageman - NASA/GSFC